package com.twlstudy;

public class HspErpApplication {
    public static void main(String[] args) {
        System.out.println("HspErpApplication 100");
        System.out.println("HspErpApplication 200 for v3.0");
        System.out.println("HspErpApplication 200 for v3.0 test");
        System.out.println("冲突 for v3.0");
        System.out.println("冲突 for v3.0 master 未修改");

        // 两个都保留
        System.out.println("冲突 手动1 master");
        System.out.println("冲突 手动 for v3.0");

    }
}
